Merge from trunk.
authorDavid Engster <dengste@eml.cc>
Sat, 1 Jun 2013 09:40:00 +0000 (11:40 +0200)
committerDavid Engster <dengste@eml.cc>
Sat, 1 Jun 2013 09:40:00 +0000 (11:40 +0200)
commit5650f87959c57afdee81ba545c613a2603cc58b7
treeb9c034e7d2099117910fdcdd10fc9e9e1aba5de0
parentc83a114b066a69949ad3cf4dc16127e9ffc5eed3
parentaeca8a1959485494377c8ec44f6fd5f55bbd7c43
Merge from trunk.